HHH-18629 Fix inconsistent column alias generated while result class is used for placeholder #9075
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
quaff
force-pushed
the
18629
branch
2 times, most recently
from
647bd5e to
6517870
Compare
|
Ready to review @beikov |
beikov
reviewed
Oct 21, 2024
Comment on lines
660
to
667
| if ( resultEntityClass != null ) { | ||
| boolean exists = false; | ||
| for ( ResultBuilder existing : resultSetMapping.getResultBuilders() ) { | ||
| if ( resultEntityClass == existing.getJavaType() ) { | ||
| exists = true; | ||
| break; | ||
| } | ||
| } | ||
| if ( !exists ) { | ||
| addEntity( (Class<R>) resultEntityClass, LockMode.READ ); | ||
| } | ||
| } |
There was a problem hiding this comment.
I was more thinking of creating a ResultSetMapping on demand instead of altering the existing one to avoid interference with user configured mappings.
Suggested change
| if ( resultEntityClass != null ) { | |
| boolean exists = false; | |
| for ( ResultBuilder existing : resultSetMapping.getResultBuilders() ) { | |
| if ( resultEntityClass == existing.getJavaType() ) { | |
| exists = true; | |
| break; | |
| } | |
| } | |
| if ( !exists ) { | |
| addEntity( (Class<R>) resultEntityClass, LockMode.READ ); | |
| } | |
| } | |
| final ResultSetMapping mapping; | |
| if ( resultJavaType != null && resultSetMapping.isDynamic() && resultSetMapping.getNumberOfResultBuilders() == 0 ) { | |
| mapping = ResultSetMapping.resolveResultSetMapping( originalSqlString, true, getSessionFactory() ); | |
| mapping.addResultBuilder( | |
| getSessionFactory().getMappingMetamodel().isEntityClass( resultJavaType ) | |
| ? Builders.entityCalculated( StringHelper.unqualify( entityType.getName() ), entityType.getName(), LockMode.READ, getSessionFactory() ) | |
| : Builders.resultClassBuilder( resultClass, getSessionFactory() ) | |
| ); | |
| } | |
| else { | |
| mapping = resultSetMapping; | |
| } |
There was a problem hiding this comment.
Amended as you suggested, please note resultEntityClass always is entity class or null.
|
Could you rebase this on current main and repush please? I'm having trouble doing it myself locally. You may have failures in |
|
Superseded by #9301 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Alternative to #8971
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license
and can be relicensed under the terms of the LGPL v2.1 license in the future at the maintainers' discretion.
For more information on licensing, please check here.
https://hibernate.atlassian.net/browse/HHH-18629